Autogenerated HTML docs for v1.5.6.2-212-g08b5
diff --git a/git-merge-index.html b/git-merge-index.html index 5c5e0f9..efd6ed3 100644 --- a/git-merge-index.html +++ b/git-merge-index.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 7.0.2" /> +<meta name="generator" content="AsciiDoc 8.2.5" /> <style type="text/css"> /* Debug borders */ p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 { @@ -16,8 +16,13 @@ margin: 1em 5% 1em 5%; } -a { color: blue; } -a:visited { color: fuchsia; } +a { + color: blue; + text-decoration: underline; +} +a:visited { + color: fuchsia; +} em { font-style: italic; @@ -39,13 +44,18 @@ line-height: 1.3; } -h1 { +h1, h2, h3 { border-bottom: 2px solid silver; } h2 { - border-bottom: 2px solid silver; padding-top: 0.5em; } +h3 { + float: left; +} +h3 + * { + clear: left; +} div.sectionbody { font-family: serif; @@ -70,7 +80,7 @@ color: #527bbd; font-family: sans-serif; font-weight: bold; - font-size: 1.2em; + font-size: 1.1em; } span#email { } @@ -139,6 +149,9 @@ padding: 0.5em; } +div.listingblock { + margin-right: 0%; +} div.listingblock > div.content { border: 1px solid silver; background: #f4f4f4; @@ -148,9 +161,13 @@ div.quoteblock > div.content { padding-left: 2.0em; } -div.quoteblock .attribution { + +div.attribution { text-align: right; } +div.verseblock + div.attribution { + text-align: left; +} div.admonitionblock .icon { vertical-align: top; @@ -194,13 +211,12 @@ ul, ol { list-style-position: outside; } -ol.olist2 { +div.olist2 ol { list-style-type: lower-alpha; } div.tableblock > table { - border-color: #527bbd; - border-width: 3px; + border: 3px solid #527bbd; } thead { font-family: sans-serif; @@ -214,6 +230,9 @@ margin-top: 0.8em; margin-bottom: 0.8em; } +div.hlist td { + padding-bottom: 5px; +} td.hlist1 { vertical-align: top; font-style: italic; @@ -226,7 +245,33 @@ @media print { div#footer-badges { display: none; } } -include::./stylesheets/xhtml11-manpage.css[] + +div#toctitle { + color: #527bbd; + font-family: sans-serif; + font-size: 1.1em; + font-weight: bold; + margin-top: 1.0em; + margin-bottom: 0.1em; +} + +div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { + margin-top: 0; + margin-bottom: 0; +} +div.toclevel2 { + margin-left: 2em; + font-size: 0.9em; +} +div.toclevel3 { + margin-left: 4em; + font-size: 0.9em; +} +div.toclevel4 { + margin-left: 6em; + font-size: 0.9em; +} +include1::./stylesheets/xhtml11-manpage.css[] /* Workarounds for IE6's broken and incomplete CSS2. */ div.sidebar-content { @@ -255,6 +300,9 @@ border-left: 2px solid silver; padding-left: 0.5em; } + +/* IE6 sets dynamically generated links as visited. */ +div#toc a:visited { color: blue; } </style> <title>git-merge-index(1)</title> </head> @@ -272,18 +320,18 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</p> +<div class="para"><p><em>git merge-index</em> [-o] [-q] <merge-program> (-a | [--] <file>*)</p></div> </div> -<h2>DESCRIPTION</h2> +<h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> -<p>This looks up the <file>(s) in the index and, if there are any merge +<div class="para"><p>This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4. File modes for the three -files are passed as arguments 5, 6 and 7.</p> +files are passed as arguments 5, 6 and 7.</p></div> </div> -<h2>OPTIONS</h2> +<h2 id="_options">OPTIONS</h2> <div class="sectionbody"> -<dl> +<div class="vlist"><dl> <dt> -- </dt> @@ -321,19 +369,19 @@ porcelains which might want to emit custom messages. </p> </dd> -</dl> -<p>If <tt>git-merge-index</tt> is called with multiple <file>s (or -a) then it +</dl></div> +<div class="para"><p>If <em>git-merge-index</em> is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit -code.</p> -<p>Typically this is run with a script calling git's imitation of -the merge command from the RCS package.</p> -<p>A sample script called <tt>git-merge-one-file</tt> is included in the -distribution.</p> -<p>ALERT ALERT ALERT! The git "merge object order" is different from the -RCS <tt>merge</tt> program merge object order. In the above ordering, the +code.</p></div> +<div class="para"><p>Typically this is run with a script calling git's imitation of +the <em>merge</em> command from the RCS package.</p></div> +<div class="para"><p>A sample script called <em>git-merge-one-file</em> is included in the +distribution.</p></div> +<div class="para"><p>ALERT ALERT ALERT! The git "merge object order" is different from the +RCS <em>merge</em> program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program -<tt>merge</tt> is to have the original in the middle. Don't ask me why.</p> -<p>Examples:</p> +<em>merge</em> is to have the original in the middle. Don't ask me why.</p></div> +<div class="para"><p>Examples:</p></div> <div class="literalblock"> <div class="content"> <pre><tt>torvalds@ppc970:~/merge-test> git merge-index cat MM @@ -342,7 +390,7 @@ This is modified MM in the branch B. # merge2 This is modified MM in the branch B. # current contents</tt></pre> </div></div> -<p>or</p> +<div class="para"><p>or</p></div> <div class="literalblock"> <div class="content"> <pre><tt>torvalds@ppc970:~/merge-test> git merge-index cat AA MM @@ -352,27 +400,27 @@ This is added AA in the branch B. fatal: merge program failed</tt></pre> </div></div> -<p>where the latter example shows how <tt>git-merge-index</tt> will stop trying to +<div class="para"><p>where the latter example shows how <em>git-merge-index</em> will stop trying to merge once anything has returned an error (i.e., <tt>cat</tt> returned an error for the AA file, because it didn't exist in the original, and thus -<tt>git-merge-index</tt> didn't even try to merge the MM thing).</p> +<em>git-merge-index</em> didn't even try to merge the MM thing).</p></div> </div> -<h2>Author</h2> +<h2 id="_author">Author</h2> <div class="sectionbody"> -<p>Written by Linus Torvalds <torvalds@osdl.org> -One-shot merge by Petr Baudis <pasky@ucw.cz></p> +<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org> +One-shot merge by Petr Baudis <pasky@ucw.cz></p></div> </div> -<h2>Documentation</h2> +<h2 id="_documentation">Documentation</h2> <div class="sectionbody"> -<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p> +<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div> </div> -<h2>GIT</h2> +<h2 id="_git">GIT</h2> <div class="sectionbody"> -<p>Part of the <a href="git.html">git(1)</a> suite</p> +<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div> </div> <div id="footer"> <div id="footer-text"> -Last updated 02-Jul-2008 03:01:53 UTC +Last updated 2008-07-06 05:16:53 UTC </div> </div> </body> 